Resolve CVS conflicts
authorMiles Bader <miles@gnu.org>
Sat, 8 Nov 2003 22:20:08 +0000 (22:20 +0000)
committerMiles Bader <miles@gnu.org>
Sat, 8 Nov 2003 22:20:08 +0000 (22:20 +0000)
commit9977c440b96e8448a81f32340ff8bf15fa6de17e
tree7fbe7b845040753733ef895268c19063e6d9173f
parentef7334c72e0e86999e8935e2bdaabb660f504634
Resolve CVS conflicts
lisp/language/kannada.el
lisp/language/knd-util.el